Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 16 Mar 2010 22:06:37 +0000 (22:06 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 16 Mar 2010 22:06:37 +0000 (22:06 +0000)

Trivial merge